fix(git): use git CLI in git_add to avoid GitPython index corruption bug#3156
Open
schuyler wants to merge 1 commit intomodelcontextprotocol:mainfrom
Open
fix(git): use git CLI in git_add to avoid GitPython index corruption bug#3156schuyler wants to merge 1 commit intomodelcontextprotocol:mainfrom
schuyler wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
GitPython's index.add() has a known bug that corrupts the git index when paths contain ./ prefixes or when . is included in the file list. The bug causes: - Files appearing with ./ prefix (e.g., ./index.md) - The .git directory itself being staged - Corrupted commits requiring git filter-repo to fix The previous implementation only handled the exact case of ["."] but failed to handle [".", "other.md"] or ["./README.md"]. This fix uses repo.git.add() (CLI wrapper) for all cases, which is consistent with how other git operations are implemented in this file and correctly handles all edge cases. References: - gitpython-developers/GitPython#375 - gitpython-developers/GitPython#292
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
GitPython's index.add() has a known bug that corrupts the git index when paths contain ./ prefixes or when . is included in the file list. The bug causes:
Motivation and Context
The previous implementation only handled the exact case of ["."] but failed to handle [".", "other.md"] or ["./README.md"]. This fix uses repo.git.add() (CLI wrapper) for all cases, which is consistent with how other git operations are implemented in this file and correctly handles all edge cases.
Testing
I have been using the
mcp-server-gitMCP to allow Claude to edit a private otterwiki. Prior to making this change locally, I was seeing corruption of the Git repository every few commits. Since applying the change about a week ago, I have been using the wiki with Claude every single day and have not seen a single error of any kind.Breaking Changes
None
Types of changes
Checklist
References